Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(schematics): fix add-icon-assets schema path #6404

Merged
merged 1 commit into from
Feb 4, 2021
Merged

fix(schematics): fix add-icon-assets schema path #6404

merged 1 commit into from
Feb 4, 2021

Conversation

maroon1
Copy link
Contributor

@maroon1 maroon1 commented Feb 4, 2021

PR Checklist

Please check if your PR fulfills the following requirements:

PR Type

What kind of change does this PR introduce?

[x] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Application (the showcase website) / infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

collection.json 中的 add-icon-assets 配置引用了一个错误的 schema 路径,导致如果其他 schematics 扩展了 ng-zorro-antd 的 schematics 后,执行 ng g --help 命令会由于配置不正确而报错

经查找,应该在某次提交 69072de 中,原有的 schema.json 被移除了

简单起见,复用了 blank schematic 目录中的 schema.json (因为 git 的 diff 结果也是显示 boot-page 被重命名为 blank 了)

What is the new behavior?

正确引用相应的 schema.json

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

add-icon-assets 实际上已经被移动到 setup-project 中作为项目初始化的一个 Rule 来用了,是否可以考虑废弃该公共 schematic

@zorro-bot
Copy link

zorro-bot bot commented Feb 4, 2021

This preview will be available after the AzureCI is passed.

@codecov
Copy link

codecov bot commented Feb 4, 2021

Codecov Report

Merging #6404 (fd3c5af) into master (27a1c4e) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6404      +/-   ##
==========================================
- Coverage   89.86%   89.85%   -0.02%     
==========================================
  Files         478      478              
  Lines       15277    15277              
  Branches     2468     2468              
==========================================
- Hits        13729    13727       -2     
- Misses        930      931       +1     
- Partials      618      619       +1     
Impacted Files Coverage Δ
components/tabs/tab-nav-bar.component.ts 82.39% <0.00%> (-0.71%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 27a1c4e...249cee7. Read the comment docs.

Copy link
Member

@hsuanxyz hsuanxyz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@hsuanxyz hsuanxyz merged commit 340670d into NG-ZORRO:master Feb 4, 2021
ZhWent pushed a commit to ZhWent/ng-zorro-antd that referenced this pull request Mar 3, 2021
* upsteam/master:
  fix(schematics): fix `add-icon-assets`  schema path (NG-ZORRO#6404)
  fix(module:tree-view): correct API typo (NG-ZORRO#6386)
  chore(release): release 11.1.0 (NG-ZORRO#6371)
  fix(module:table): fix table `nzBordered` (NG-ZORRO#6367)
  fix(module:typography): edit area cannot get the content (NG-ZORRO#6369)
  feat(module:table): add support for ReadonlyArray (NG-ZORRO#6156)
  build: update to 11.1 (NG-ZORRO#6365)
  chore: sync ant-design v4.10.3 (NG-ZORRO#6364)
  feat(module:table): support nzPaginationType property (NG-ZORRO#5986)
  feat(module:date-picker): support nzId (NG-ZORRO#6242) (NG-ZORRO#6246)
  feat(module:upload): support `NzUploadFile` parameter of `nzIconRender` (NG-ZORRO#6283)
  feat(module:modal): add nzCentered for modal (NG-ZORRO#6333)
  chore: sync ant-design v4.10.2 (NG-ZORRO#6334)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants